From 6fa44ae40794f1f0c58915db5fa5d0686d5112c9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 25 Oct 2004 14:09:49 +0000 Subject: [PATCH] Use gtk_image_new_from_icon_name(). 2004-10-25 Matthias Clasen * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). --- ChangeLog | 6 +++++- ChangeLog.pre-2-10 | 6 +++++- ChangeLog.pre-2-6 | 6 +++++- ChangeLog.pre-2-8 | 6 +++++- tests/testicontheme.c | 5 ----- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-10-25 Matthias Clasen + + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + 2004-10-25 Matthias Clasen Add a public setting for button ordering (#74669, Owen Taylor) @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2004-10-25 Matthias Clasen + + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + 2004-10-25 Matthias Clasen Add a public setting for button ordering (#74669, Owen Taylor) @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2004-10-25 Matthias Clasen + + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + 2004-10-25 Matthias Clasen Add a public setting for button ordering (#74669, Owen Taylor) @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2004-10-25 Matthias Clasen + + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + 2004-10-25 Matthias Clasen Add a public setting for button ordering (#74669, Owen Taylor) @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/tests/testicontheme.c b/tests/testicontheme.c index dafc2ecba9..a28c55ca5e 100644 --- a/tests/testicontheme.c +++ b/tests/testicontheme.c @@ -63,12 +63,7 @@ main (int argc, char *argv[]) size = GTK_ICON_SIZE_BUTTON; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); -#if 1 - pixbuf = gtk_icon_theme_load_icon (icon_theme, argv[3], size, 0, NULL); - image = gtk_image_new_from_pixbuf (pixbuf); -#else image = gtk_image_new_from_icon_name (argv[3], size); -#endif gtk_container_add (GTK_CONTAINER (window), image); gtk_widget_show_all (window); -- 2.30.2